Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clam 2585 ole check encrypted 3 #1295

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

ragusaa
Copy link
Contributor

@ragusaa ragusaa commented Jun 28, 2024

No description provided.

@ragusaa ragusaa force-pushed the CLAM-2585-OleCheckEncrypted_3 branch from 95feff1 to 903eb07 Compare June 28, 2024 15:31
@micahsnyder
Copy link
Contributor

Replaced by #1279

@micahsnyder micahsnyder reopened this Jun 28, 2024
@micahsnyder
Copy link
Contributor

My mistake, this one replaces the other.

Copy link
Contributor

@micahsnyder micahsnyder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other the formatting, I don't have any other concerns.

libclamav/ole2_extract.c Outdated Show resolved Hide resolved
libclamav/ole2_extract.c Outdated Show resolved Hide resolved
@ragusaa ragusaa force-pushed the CLAM-2585-OleCheckEncrypted_3 branch 2 times, most recently from 74aa9b5 to 2057326 Compare July 18, 2024 14:37
@ragusaa
Copy link
Contributor Author

ragusaa commented Jul 18, 2024

I ran clam-format to clean up the formatting, so I think this one is good to go.

@ragusaa ragusaa requested a review from micahsnyder July 18, 2024 17:15
@micahsnyder micahsnyder force-pushed the CLAM-2585-OleCheckEncrypted_3 branch from 2057326 to 481a8b6 Compare July 22, 2024 16:27
@micahsnyder
Copy link
Contributor

Just rebased with upstream main to get the CI fixes and other clang-format fixes.

Add keys to the metadata.json file that informs the user that a scanned
ole2 file is encrypted.  Information about the type of encryption is
provided when the information is available.  This feature co-authored by
Micah Snyder.
@micahsnyder micahsnyder force-pushed the CLAM-2585-OleCheckEncrypted_3 branch from 481a8b6 to 6d50a60 Compare September 10, 2024 15:51
@micahsnyder
Copy link
Contributor

Rebased again

@micahsnyder micahsnyder merged commit 8ae19ec into Cisco-Talos:main Sep 11, 2024
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants